Merge.
authorsos22@douglas.cl.cam.ac.uk <sos22@douglas.cl.cam.ac.uk>
Wed, 23 Nov 2005 12:35:50 +0000 (13:35 +0100)
committersos22@douglas.cl.cam.ac.uk <sos22@douglas.cl.cam.ac.uk>
Wed, 23 Nov 2005 12:35:50 +0000 (13:35 +0100)
commit27fa09fe1d20b368aa601aac00410e11c462b759
treec4c68d5151f0a6404ac16d5b487b8ece3d48c81e
parent05607bfc8f18144fa2feee3ce83391faca89d8e8
parent9d401b35f071a91e7281fcdd4a5ceba0dc125ba4
Merge.

Signed-off-by: Steven Smith, sos22@cam.ac.uk